HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1394:7148df61e6b2

Added support for headerDataChanged() signal from the model to BarModelMapper

Marek Rosa -

r1394:7148df61e6b2

parent child

Context file:

r1394:7148df61e6b2

Collapse all files

examples/legend/mainwidget.cpp +6 -4

                 m_chart = new QChart();
                 m_chartView = new QChartView(m_chart, this);
                 m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
+                m_chart->setAnimationOptions(QChart::SeriesAnimations);
             //![1]
                 // Create custom scene and view, where detached legend will be drawn
             void MainWidget::removeBarset()
             {
-                QList<QBarSet*> sets = m_series->barSets();
+                m_series->clear();
-                if (sets.count() > 0) {
+            //    QList<QBarSet*> sets = m_series->barSets();
-                    m_series->remove(sets.at(sets.count()-1));
+            //    if (sets.count() > 0) {
+            //        m_series->remove(sets.at(sets.count()-1));
+            //    }
             }

src/animations/chartanimator.cpp +3 0

             {
                 BarAnimation *animation = static_cast<BarAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
+                animation->stop();
                 animation->setDuration(ChartAnimationDuration);
+                animation->setStartValue(qVariantFromValue(oldLayout));
                 animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                 animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
+                animation->setEndValue(qVariantFromValue(newLayout));
                 QTimer::singleShot(0, animation, SLOT(start()));
             }

src/barchart/qbarmodelmapper.cpp +23 -1

                 d->initializeBarFromModel();
                 //    connect signals from the model
                 connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
+                connect(d->m_model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), d, SLOT(modelHeaderDataUpdated(Qt::Orientation,int,int)));
                 connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int)));
                 connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
                 connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
                 blockSeriesSignals(false);
             }
+            void QBarModelMapperPrivate::modelHeaderDataUpdated(Qt::Orientation orientation, int first, int last)
+            {
+                if (m_model == 0 || m_series == 0)
+                    return;
+                if (m_modelSignalsBlock)
+                    return;
+                blockSeriesSignals();
+                if (orientation != m_orientation) {
+                    for (int section = first; section <= last; section++) {
+                        if (section >= m_firstBarSetSection && section <= m_lastBarSetSection) {
+                            QBarSet* bar = m_series->barSets().at(section - m_firstBarSetSection);
+                            if (bar)
+                                bar->setName(m_model->headerData(section, orientation).toString());
+                        }
+                    }
+                }
+                blockSeriesSignals(false);
+            }
             void QBarModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent);
                     QModelIndex barIndex = barModelIndex(i, posInBar);
                     // check if there is such model index
                     if (barIndex.isValid()) {
-                        QBarSet *barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal).toString());
+                        QBarSet *barSet = new QBarSet(m_model->headerData(i, m_orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical).toString());
                         while (barIndex.isValid()) {
                             barSet->append(m_model->data(barIndex, Qt::DisplayRole).toDouble());
                             posInBar++;

src/barchart/qbarmodelmapper_p.h +1 0

             public Q_SLOTS:
                 // for the model
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
+                void modelHeaderDataUpdated(Qt::Orientation orientation, int first, int last);
                 void modelRowsAdded(QModelIndex parent, int start, int end);
                 void modelRowsRemoved(QModelIndex parent, int start, int end);
                 void modelColumnsAdded(QModelIndex parent, int start, int end);

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