HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1317:1951d151d7af

Fixed problem with qhxymodelmapper

Marek Rosa -

r1317:1951d151d7af

parent child

Context file:

r1317:1951d151d7af

Collapse all files

src/xychart/qxymodelmapper.cpp +29 -13

                 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
                     for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
                         index = topLeft.sibling(row, column);
-                        if (m_orientation == Qt::Vertical && (index.column() == m_xSection|| index.column() == m_ySection)) {
+                        if (m_orientation == Qt::Vertical && (index.column() == m_xSection || index.column() == m_ySection)) {
                             if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count)) {
-                                oldPoint = m_series->points().at(index.row() - m_first);
+                                QModelIndex xIndex = xModelIndex(index.row() - m_first);
-                                newPoint.setX(m_model->data(m_model->index(index.row(), m_xSection)).toReal());
+                                QModelIndex yIndex = yModelIndex(index.row() - m_first);
-                                newPoint.setY(m_model->data(m_model->index(index.row(), m_ySection)).toReal());
+                                if (xIndex.isValid() && yIndex.isValid()) {
+                                    oldPoint = m_series->points().at(index.row() - m_first);
+                                    newPoint.setX(m_model->data(xIndex).toReal());
+                                    newPoint.setY(m_model->data(yIndex).toReal());
+                                }
                             }
                         } else if (m_orientation == Qt::Horizontal && (index.row() == m_xSection || index.row() == m_ySection)) {
                             if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count)) {
-                                oldPoint = m_series->points().at(index.column() - m_first);
+                                QModelIndex xIndex = xModelIndex(index.column() - m_first);
-                                newPoint.setX(m_model->data(m_model->index(m_xSection, index.column())).toReal());
+                                QModelIndex yIndex = yModelIndex(index.column() - m_first);
-                                newPoint.setY(m_model->data(m_model->index(m_ySection, index.column())).toReal());
+                                if (xIndex.isValid() && yIndex.isValid()) {
+                                    oldPoint = m_series->points().at(index.column() - m_first);
+                                    newPoint.setX(m_model->data(xIndex).toReal());
+                                    newPoint.setY(m_model->data(yIndex).toReal());
+                                }
                             }
                         } else {
                             continue;
                     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++) {
                         QPointF point;
-                        point.setX(m_model->data(xModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                        QModelIndex xIndex = xModelIndex(i - m_first);
-                        point.setY(m_model->data(yModelIndex(i - m_first), Qt::DisplayRole).toDouble());
+                        QModelIndex yIndex = yModelIndex(i - m_first);
-                        m_series->insert(i - m_first, point);
+                        if (xIndex.isValid() && yIndex.isValid()) {
+                            point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
+                            point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
+                            m_series->insert(i - m_first, point);
+                        }
                     }
                     // remove excess of slices (abouve m_count)
                         if (toBeAdded > 0)
                             for (int i = m_series->count(); i < currentSize + toBeAdded; i++) {
                                 QPointF point;
-                                point.setX(m_model->data(xModelIndex(i), Qt::DisplayRole).toDouble());
+                                QModelIndex xIndex = xModelIndex(i);
-                                point.setY(m_model->data(yModelIndex(i), Qt::DisplayRole).toDouble());
+                                QModelIndex yIndex = yModelIndex(i);
-                                m_series->insert(i, point);
+                                if (xIndex.isValid() && yIndex.isValid()) {
+                                    point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
+                                    point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
+                                    m_series->insert(i, point);
+                                }
                             }
                     }
                 }

tests/tablemodelchart/customtablemodel.cpp +6 -6

                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 m_columnCount = 7;
-                m_rowCount = 9;
+                m_rowCount = 1029;
                 m_labels.append("Apples");
                 m_labels.append("Oranges");
             int CustomTableModel::columnCount(const QModelIndex & parent) const
             {
                 Q_UNUSED(parent)
-                return m_columnCount + 1;
+                return m_columnCount;// + 1;
             }
             QVariant CustomTableModel::headerData (int section, Qt::Orientation orientation, int role ) const
                 {
                     switch(index.column())
                     {
-                    case 7:
+            //        case 7:
-                        return m_labels[index.row()];
+            //            return m_labels[index.row()];
                     default:
                         return m_data[index.row()]->at(index.column());
                         break;
                 {
                     switch(index.column())
                     {
-                    case 7:
+            //        case 7:
-                        return m_labels[index.row()];
+            //            return m_labels[index.row()];
                     default:
                         return m_data[index.row()]->at(index.column());
                         break;

tests/tablemodelchart/tablewidget.cpp +14 -14

                     if (m_lineRadioButton->isChecked())
                     {
-                        m_chart->setAnimationOptions(QChart::NoAnimation);
+            //            m_chart->setAnimationOptions(QChart::NoAnimation);
                         // series 1
                         m_series = new QLineSeries;
-                        m_mapper = new QHXYModelMapper;
+            //            m_mapper = new QHXYModelMapper;
-                        m_mapper->setModel(m_model);
-                        m_mapper->setSeries(m_series);
-                        m_mapper->setXRow(0);
-                        m_mapper->setYRow(1);
-                        m_mapper->setFirst(3);
-                        m_mapper->setCount(4);
-            //            m_mapper = new QVXYModelMapper;
             //            m_mapper->setModel(m_model);
             //            m_mapper->setSeries(m_series);
-            //            m_mapper->setXColumn(0);
+            //            m_mapper->setXRow(0);
-            //            m_mapper->setYColumn(1);
+            //            m_mapper->setYRow(1);
             //            m_mapper->setFirst(3);
             //            m_mapper->setCount(4);
+                        m_mapper = new QVXYModelMapper;
+                        m_mapper->setModel(m_model);
+                        m_mapper->setSeries(m_series);
+                        m_mapper->setXColumn(0);
+                        m_mapper->setYColumn(1);
+                        m_mapper->setFirst(3);
+            //            m_mapper->setCount(4);
                         //            m_series->setModelMapping(0,1, Qt::Vertical);
                         //            m_series->setModelMappingRange(3, 4);
                         m_chart->addSeries(m_series);
                     if (!m_barRadioButton->isChecked()) {
-                        m_chart->axisX()->setRange(0, 500);
+            //            m_chart->axisX()->setRange(0, 500);
-                        m_chart->axisY()->setRange(0, 220);
+            //            m_chart->axisY()->setRange(0, 220);
                     }
                     m_chart->legend()->setVisible(true);

tests/tablemodelchart/tablewidget.h +1 -1

                 QChartView* m_chartView;
                 QChart* m_chart;
                 QXYSeries* m_series;
-                QHXYModelMapper *m_mapper;
+                QVXYModelMapper *m_mapper;
                 CustomTableModel* m_model;
                 QTableView* m_tableView;
                 QRadioButton* m_lineRadioButton;

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