HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1320:42dbf474caea

Fixed problem with PieModelMapper

Marek Rosa -

r1320:42dbf474caea

parent child

Context file:

r1320:42dbf474caea

Collapse all files

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +11 -4

                         verticalPosition: 0.3
                     }
-                    VPieModelMapper {
+            //        VPieModelMapper {
+            //            series: pieSeries
+            //            model: customModel
+            //            labelsColumn: 1
+            //            valuesColumn: 2
+            //            first: 1
+            //        }
+                    HPieModelMapper {
                         series: pieSeries
                         model: customModel
-                        labelsColumn: 1
+                        labelsRow: 1
-                        valuesColumn: 2
+                        valuesRow: 2
-                        first: 1
+                        first: 2
                     }
                     AreaSeries {

src/piechart/qhpiemodelmapper.cpp +4 -4

             int QHPieModelMapper::valuesRow() const
             {
-                return QPieModelMapper::valuesIndex();
+                return QPieModelMapper::valuesSection();
             }
             void QHPieModelMapper::setValuesRow(int valuesRow)
             {
-                QPieModelMapper::setValuesIndex(valuesRow);
+                QPieModelMapper::setValuesSection(valuesRow);
             }
             int QHPieModelMapper::labelsRow() const
             {
-                return QPieModelMapper::labelsIndex();
+                return QPieModelMapper::labelsSection();
             }
             void QHPieModelMapper::setLabelsRow(int labelsRow)
             {
-                QPieModelMapper::setLabelsIndex(labelsRow);
+                QPieModelMapper::setLabelsSection(labelsRow);
             }
             #include "moc_qhpiemodelmapper.cpp"

src/piechart/qpiemodelmapper.cpp +51 -37

                 d->initializePieFromModel();
             }
-            int QPieModelMapper::valuesIndex() const
+            int QPieModelMapper::valuesSection() const
             {
                 Q_D(const QPieModelMapper);
-                return d->m_valuesIndex;
+                return d->m_valuesSection;
             }
-            void QPieModelMapper::setValuesIndex(int valuesIndex)
+            void QPieModelMapper::setValuesSection(int valuesSection)
             {
                 Q_D(QPieModelMapper);
-                d->m_valuesIndex = qMax(-1, valuesIndex);
+                d->m_valuesSection = qMax(-1, valuesSection);
                 d->initializePieFromModel();
             }
-            int QPieModelMapper::labelsIndex() const
+            int QPieModelMapper::labelsSection() const
             {
                 Q_D(const QPieModelMapper);
-                return d->m_labelsIndex;
+                return d->m_labelsSection;
             }
-            void QPieModelMapper::setLabelsIndex(int labelsIndex)
+            void QPieModelMapper::setLabelsSection(int labelsSection)
             {
                 Q_D(QPieModelMapper);
-                d->m_labelsIndex = qMax(-1, labelsIndex);
+                d->m_labelsSection = qMax(-1, labelsSection);
                 d->initializePieFromModel();
             }
                 d->m_first = 0;
                 d->m_count = -1;
                 d->m_orientation = Qt::Vertical;
-                d->m_valuesIndex = -1;
+                d->m_valuesSection = -1;
-                d->m_labelsIndex = -1;
+                d->m_labelsSection = -1;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 m_first(0),
                 m_count(-1),
                 m_orientation(Qt::Vertical),
-                m_valuesIndex(-1),
+                m_valuesSection(-1),
-                m_labelsIndex(-1),
+                m_labelsSection(-1),
                 m_seriesSignalsBlock(false),
                 m_modelSignalsBlock(false),
                 q_ptr(q)
             QPieSlice* QPieModelMapperPrivate::pieSlice(QModelIndex index) const
             {
-                if (m_orientation == Qt::Vertical && (index.column() == m_valuesIndex || index.column() == m_labelsIndex)) {
+                if (!index.isValid())
-                    if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count))
+                    return 0; // index is invalid
+                if (m_orientation == Qt::Vertical && (index.column() == m_valuesSection || index.column() == m_labelsSection)) {
+                    if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count)) {
+                        if (m_model->index(index.row(), m_valuesSection).isValid() && m_model->index(index.row(), m_labelsSection).isValid())
                             return m_series->slices().at(index.row() - m_first);
-                } else if (m_orientation == Qt::Horizontal && (index.row() == m_valuesIndex || index.row() == m_labelsIndex)) {
+                        else
-                    if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
+                            return 0;
+                    }
+                } else if (m_orientation == Qt::Horizontal && (index.row() == m_valuesSection || index.row() == m_labelsSection)) {
+                    if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count)) {
+                        if (m_model->index(m_valuesSection, index.column()).isValid() && m_model->index(m_labelsSection, index.column()).isValid())
                             return m_series->slices().at(index.column() - m_first);
+                        else
+                            return 0;
+                    }
                 }
                 return 0; // This part of model has not been mapped to any slice
             }
                     return QModelIndex(); // invalid
                 if (m_orientation == Qt::Vertical)
-                    return m_model->index(slicePos + m_first, m_valuesIndex);
+                    return m_model->index(slicePos + m_first, m_valuesSection);
                 else
-                    return m_model->index(m_valuesIndex, slicePos + m_first);
+                    return m_model->index(m_valuesSection, slicePos + m_first);
             }
             QModelIndex QPieModelMapperPrivate::labelModelIndex(int slicePos)
                     return QModelIndex(); // invalid
                 if (m_orientation == Qt::Vertical)
-                    return m_model->index(slicePos + m_first, m_labelsIndex);
+                    return m_model->index(slicePos + m_first, m_labelsSection);
                 else
-                    return m_model->index(m_labelsIndex, slicePos + m_first);
+                    return m_model->index(m_labelsSection, slicePos + m_first);
             }
             bool QPieModelMapperPrivate::isLabelIndex(QModelIndex index) const
             {
-                if (m_orientation == Qt::Vertical && index.column() == m_labelsIndex)
+                if (m_orientation == Qt::Vertical && index.column() == m_labelsSection)
                     return true;
-                else if (m_orientation == Qt::Horizontal && index.row() == m_labelsIndex)
+                else if (m_orientation == Qt::Horizontal && index.row() == m_labelsSection)
                     return true;
                 return false;
             bool QPieModelMapperPrivate::isValueIndex(QModelIndex index) const
             {
-                if (m_orientation == Qt::Vertical && index.column() == m_valuesIndex)
+                if (m_orientation == Qt::Vertical && index.column() == m_valuesSection)
                     return true;
-                else if (m_orientation == Qt::Horizontal && index.row() == m_valuesIndex)
+                else if (m_orientation == Qt::Horizontal && index.row() == m_valuesSection)
                     return true;
                 return false;
                 blockSeriesSignals();
                 if (m_orientation == Qt::Vertical)
                     insertData(start, end);
-                else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
+                else if (start <= m_valuesSection || start <= m_labelsSection) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
                 blockSeriesSignals();
                 if (m_orientation == Qt::Vertical)
                     removeData(start, end);
-                else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
+                else if (start <= m_valuesSection || start <= m_labelsSection) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
                 blockSeriesSignals();
                 if (m_orientation == Qt::Horizontal)
                     insertData(start, end);
-                else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
+                else if (start <= m_valuesSection || start <= m_labelsSection) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
                 blockSeriesSignals();
                 if (m_orientation == Qt::Horizontal)
                     removeData(start, end);
-                else if (start <= m_valuesIndex || start <= m_labelsIndex) // if the changes affect the map - reinitialize the pie
+                else if (start <= m_valuesSection || start <= m_labelsSection) // if the changes affect the map - reinitialize the pie
                     initializePieFromModel();
                 blockSeriesSignals(false);
             }
                     int first = qMax(start, m_first);
                     int last = qMin(first + addedCount - 1, m_orientation == Qt::Vertical ? m_model->rowCount() - 1 : m_model->columnCount() - 1);
                     for (int i = first; i <= last; i++) {
+                        QModelIndex valueIndex = valueModelIndex(i - m_first);
+                        QModelIndex labelIndex = labelModelIndex(i - m_first);
+                        if (valueIndex.isValid() && labelIndex.isValid()) {
                             QPieSlice *slice = new QPieSlice;
-                        slice->setValue(m_model->data(valueModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                            slice->setValue(m_model->data(valueIndex, Qt::DisplayRole).toDouble());
-                        slice->setLabel(m_model->data(labelModelIndex(i - m_first), Qt::DisplayRole).toString());
+                            slice->setLabel(m_model->data(labelIndex, Qt::DisplayRole).toString());
                             slice->setLabelVisible();
                             connect(slice, SIGNAL(labelChanged()), this, SLOT(sliceLabelChanged()));
                             connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                             m_series->insert(i - m_first, slice);
                             m_slices.insert(i - m_first, slice);
                         }
+                    }
                     // remove excess of slices (abouve m_count)
                     if (m_count != -1 && m_series->slices().size() > m_count)
                         int currentSize = m_series->slices().size();
                         if (toBeAdded > 0)
                             for (int i = m_series->slices().size(); i < currentSize + toBeAdded; i++) {
+                                QModelIndex valueIndex = valueModelIndex(i - m_first);
+                                QModelIndex labelIndex = labelModelIndex(i - m_first);
+                                if (valueIndex.isValid() && labelIndex.isValid()) {
                                     QPieSlice *slice = new QPieSlice;
-                                if (m_orientation == Qt::Vertical) {
+                                    slice->setValue(m_model->data(valueIndex, Qt::DisplayRole).toDouble());
-                                    slice->setValue(m_model->data(m_model->index(i + m_first, m_valuesIndex), Qt::DisplayRole).toDouble());
+                                    slice->setLabel(m_model->data(labelIndex, Qt::DisplayRole).toString());
-                                    slice->setLabel(m_model->data(m_model->index(i + m_first, m_labelsIndex), Qt::DisplayRole).toString());
-                                } else {
-                                    slice->setValue(m_model->data(m_model->index(m_valuesIndex, i + m_first), Qt::DisplayRole).toDouble());
-                                    slice->setLabel(m_model->data(m_model->index(m_labelsIndex, i + m_first), Qt::DisplayRole).toString());
                                     slice->setLabelVisible();
                                     m_series->insert(i, slice);
                                     m_slices.insert(i, slice);
                             }
                     }
                 }
+            }
             void QPieModelMapperPrivate::initializePieFromModel()
             {

src/piechart/qpiemodelmapper.h +4 -4

                 void reset();
             protected:
-                int valuesIndex() const;
+                int valuesSection() const;
-                void setValuesIndex(int valuesIndex);
+                void setValuesSection(int valuesSection);
-                int labelsIndex() const;
+                int labelsSection() const;
-                void setLabelsIndex(int labelsIndex);
+                void setLabelsSection(int labelsSection);
                 Qt::Orientation orientation() const;
                 void setOrientation(Qt::Orientation orientation);

src/piechart/qpiemodelmapper_p.h +2 -2

                 int m_first;
                 int m_count;
                 Qt::Orientation m_orientation;
-                int m_valuesIndex;
+                int m_valuesSection;
-                int m_labelsIndex;
+                int m_labelsSection;
                 bool m_seriesSignalsBlock;
                 bool m_modelSignalsBlock;

src/piechart/qvpiemodelmapper.cpp +4 -4

             int QVPieModelMapper::valuesColumn() const
             {
-                return QPieModelMapper::valuesIndex();
+                return QPieModelMapper::valuesSection();
             }
             void QVPieModelMapper::setValuesColumn(int valuesColumn)
             {
-                QPieModelMapper::setValuesIndex(valuesColumn);
+                QPieModelMapper::setValuesSection(valuesColumn);
             }
             int QVPieModelMapper::labelsColumn() const
             {
-                return QPieModelMapper::labelsIndex();
+                return QPieModelMapper::labelsSection();
             }
             void QVPieModelMapper::setLabelsColumn(int labelsColumn)
             {
-                QPieModelMapper::setLabelsIndex(labelsColumn);
+                QPieModelMapper::setLabelsSection(labelsColumn);
             }
             #include "moc_qvpiemodelmapper.cpp"

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