HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r735:8b3d19ded350

Some more work on mapping with limits

Marek Rosa -

r735:8b3d19ded350

parent child

Context file:

r735:8b3d19ded350

Collapse all files

examples/tablemodelchart/customtablemodel.cpp +30 -9

                 for (int i = 0; i < 6; i++)
                 {
                     QVector<qreal>* dataVec = new QVector<qreal>(6);
+                    QVector<QColor>* colorVec = new QVector<QColor>(6);
                     for (int k = 0; k < dataVec->size(); k++)
+                    {
                         if (k%2 == 0)
                             dataVec->replace(k, i * 50 + qrand()%20);
                         else
                             dataVec->replace(k, qrand()%100);
+                        colorVec->replace(k, QColor(Qt::white));
+                    }
                     m_data.append(dataVec);
                     m_labels.append(QString("Row: %1").arg((i + 1)));
+                    m_rowsColors.append(colorVec);
                 }
             }
                         break;
                     }
                 }
+                else if (role == Qt::BackgroundRole)
+                    {
+                        return m_rowsColors[index.row()]->at(index.column());
+                    }
                 return QVariant();
             }
                     emit dataChanged(index, index);
                     return true;
                 }
+                else if (role == Qt::BackgroundRole)
+                    {
+                        m_rowsColors[index.row()]->replace(index.column(), value.value<QColor>());
+                        return true;
+                    }
                 return false;
             }
                 for (int i = row; i < row + count; i++)
                 {
                     //        m_points.insert(row, QPointF(10,20));
                     QVector<qreal>* dataVec = new QVector<qreal>(6);
+                    QVector<QColor>* colorVec = new QVector<QColor>(6);
                     for (int k = 0; k < dataVec->size(); k++)
+                    {
                         if (k%2 == 0)
                             //                dataVec->replace(k, i * 50 + qrand()%20);
                         {
                             int difference = 0;
-                            if (row < m_data.size())
+                            if (i < m_data.size())
                             {
-                                if (row - 1 >= 0)
+                                if (i - 1 >= 0)
                                 {
-                                    difference = (int)(qAbs(m_data[row]->at(k) - m_data[row - 1]->at(k)));
+                                    difference = (int)((qAbs(m_data[i]->at(k) - m_data[row - 1]->at(k)))/count);
-                                    dataVec->replace(k, m_data[row - 1]->at(k) + qrand()%qMax(1, difference));
+                                    dataVec->replace(k, m_data[i - 1]->at(k) + qrand()%qMax(1, difference));
                                 }
                                 else
                                     dataVec->replace(k, qrand()%40 + 10);
                             }
                             else
-                                if (row - 1 >= 0)
+                                if (i - 1 >= 0)
                                 {
-                                    dataVec->replace(k, m_data[row - 1]->at(k) + qrand()%40 + 10);
+                                    dataVec->replace(k, m_data[i - 1]->at(k) + qrand()%40 + 10);
                                 }
                                 else
                                 {
                                     dataVec->replace(k, qrand()%40 + 10);
                                 }
+                            }
                         }
                         else
                             dataVec->replace(k, qrand()%100);
-                    m_data.insert(row, dataVec);
+                        colorVec->replace(k, QColor(Qt::white));
-                    m_labels.insert(row,(QString("Row: %1").arg(row + 1)));
+                    m_data.insert(i, dataVec);
+                    m_labels.insert(i,(QString("Row: %1").arg(i + 1)));
+                    m_rowsColors.insert(i, colorVec);
                 }
                 endInsertRows();
                 return true;

examples/tablemodelchart/customtablemodel.h +2 0

             #include <QAbstractTableModel>
             #include <QPointF>
             #include <QStringList>
+            #include <QColor>
             class CustomTableModel : public QAbstractTableModel
             {
                 //public slots:
             private:
                 QList<QVector<qreal>* > m_data;
+                QList<QVector<QColor>* > m_rowsColors;
                 QList<QPointF> m_points;
                 QStringList m_labels;

examples/tablemodelchart/tablewidget.cpp +39 -3

             #include "qbarseries.h"
             #include <QPushButton>
             #include <QRadioButton>
+            #include <QSpinBox>
             #include <QTime>
             TableWidget::TableWidget(QWidget *parent)
                 QPushButton* removeRowButton = new QPushButton("Remove row");
                 connect(removeRowButton, SIGNAL(clicked()), this, SLOT(removeRow()));
+                linesCountSpinBox = new QSpinBox;
+                linesCountSpinBox->setRange(1, 10);
+                linesCountSpinBox->setValue(1);
                 // buttons layout
                 QVBoxLayout* buttonsLayout = new QVBoxLayout;
+                buttonsLayout->addWidget(linesCountSpinBox);
                 buttonsLayout->addWidget(addRowAboveButton);
                 buttonsLayout->addWidget(addRowBelowButton);
                 buttonsLayout->addWidget(removeRowButton);
             void TableWidget::addRowAbove()
             {
             //    m_model->insertRow(m_model->rowCount());
-                m_model->insertRow(tableView->currentIndex().row());
+            //    m_model->insertRow(tableView->currentIndex().row());
+                m_model->insertRows(tableView->currentIndex().row(), linesCountSpinBox->value());
             }
             void TableWidget::addRowBelow()
             {
             //    m_model->insertRow(m_model->rowCount());
-                m_model->insertRow(tableView->currentIndex().row() + 1);
+            //    m_model->insertRow(tableView->currentIndex().row() + 1);
+                m_model->insertRows(tableView->currentIndex().row() + 1, linesCountSpinBox->value());
             }
             void TableWidget::removeRow()
             {
             //    m_model->removeRow(m_model->rowCount() - 1);
-                m_model->removeRow(tableView->currentIndex().row());
+            //    m_model->removeRow(tableView->currentIndex().row());
+                m_model->removeRows(tableView->currentIndex().row(), qMin(m_model->rowCount() - tableView->currentIndex().row(), linesCountSpinBox->value()));
             }
             void TableWidget::updateChartType()
                 if (lineRadioButton->isChecked())
                 {
+                    QPen pen;
+                    pen.setWidth(2);
+                    QColor seriesColor("#8FBC8F");
                     // series 1
                     series = new QLineSeries;
                     series->setModel(m_model);
                     series->setModelMapping(0,1, Qt::Vertical);
                     series->setModelMappingShift(1, 4);
             //        series->setModelMapping(0,1, Qt::Horizontal);
+                    pen.setColor(seriesColor);
+                    series->setPen(pen);
                     chartView->addSeries(series);
+                    for (int i = 1; i <=4; i++)
+                    {
+                        m_model->setData(m_model->index(i, 0), seriesColor  , Qt::BackgroundRole);
+                        m_model->setData(m_model->index(i, 1), seriesColor  , Qt::BackgroundRole);
+                    }
+            //        tableView->setsetStyleSheet("QTableView { border: 2px solid red }");
+                    seriesColor = QColor("#1E90FF");
                     // series 2
                     series = new QLineSeries;
                     series->setModel(m_model);
                     series->setModelMapping(2,3, Qt::Vertical);
             //        series->setModelMapping(2,3, Qt::Horizontal);
+                    pen.setColor(seriesColor);
+                    series->setPen(pen);
                     chartView->addSeries(series);
+                    chartView->axisX()->setRange(0, 500);
+                    for (int i = 0; i < m_model->rowCount(); i++)
+                    {
+                        m_model->setData(m_model->index(i, 2), seriesColor  , Qt::BackgroundRole);
+                        m_model->setData(m_model->index(i, 3), seriesColor  , Qt::BackgroundRole);
+                    }
             //        // series 3
             //        series = new QLineSeries;
             //        series->setModel(m_model);
                     series = new QSplineSeries;
                     series->setModel(m_model);
                     series->setModelMapping(2,3, Qt::Vertical);
+                    series->setModelMappingShift(0, 0);
             //        series->setModelMapping(2,3, Qt::Horizontal);
                     chartView->addSeries(series);
                     series = new QSplineSeries;
                     series->setModel(m_model);
                     series->setModelMapping(4,5, Qt::Vertical);
+                    series->setModelMappingShift(0, 0);
             //        series->setModelMapping(4,5, Qt::Horizontal);
                     chartView->addSeries(series);
                 }

examples/tablemodelchart/tablewidget.h +2 0

             class CustomTableModel;
             class QTableView;
             class QRadioButton;
+            class QSpinBox;
             //class QSeries;
             class TableWidget : public QWidget
                 QRadioButton* pieRadioButton;
                 QRadioButton* areaRadioButton;
                 QRadioButton* barRadioButton;
+                QSpinBox* linesCountSpinBox;
             };
             #endif // TABLEWIDGET_H

src/barchart/qbarseries.cpp +3 -3

                 m_mapCategories = categories;
                 m_mapBarBottom = bottomBoundry;
                 m_mapBarTop = topBoundry;
-                m_mapFirst = 1;
+            //    m_mapFirst = 1;
                 m_mapOrientation = orientation;
                 // connect the signals
                 if (m_mapOrientation == Qt::Vertical)
                 {
-                    m_mapCount = m_model->rowCount();
+                    m_mapCount = m_model->rowCount() - m_mapFirst;
                     connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
                     connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
                     connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
                 }
                 else
                 {
-                    m_mapCount = m_model->columnCount();
+                    m_mapCount = m_model->columnCount() - m_mapFirst;
                     connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
                     connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
                     connect(m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));

src/xychart/qxyseries.cpp +21 -19

                         // check how many mapped items there is currently (before new items are added)
                         // if the number of items currently is equal the m_mapCount then some needs to be removed from xychartitem
                         // internal storage before new ones can be added
+                        int itemsToRemove = qMin(count() - (start - m_mapFirst), end - start + 1);
                         if (m_mapCount == count())
-                            for (int i = 0; i < qMin(count(), end - start + 1); i++)
+                            for (int i = 0; i < itemsToRemove; i++)
                                 emit pointRemoved(count() - 1 - i);
                     }
                 }
                         // the added data is in the mapped area or before it
                         // update needed
                         if (count() > 0)
-                            for (int i = 0; i < qMin(m_mapCount, end - start + 1); i++)
+                            for (int i = 0; i < qMin(m_mapCount - (start - m_mapFirst), end - start + 1); i++)
                                 emit pointAdded(qMax(start + i - m_mapFirst, 0));
                     }
                 }
                     {
                         // the removed data is in the mapped area or before it
                         // update needed
-                        int itemsToRemove = qMin(count(), end - start + 1);
-                        tempItemsRemoved = itemsToRemove;
+                        // check how many items need to be removed from the xychartitem storage
-                        int z = count();
+                        // the number equals the number of items that are removed and that lay before
-                        z = z;
+                        // or in the mapped area. Items that lay beyond the map do not count
-                        //            if (itemsToRemove > 0)
+                        // the max is the current number of items in storage (count())
-                        //            {
+                        int itemsToRemove = qMin(count(), qMin(end, m_mapFirst + m_mapCount - 1) - start + 1);
                         for (int i = 0; i < itemsToRemove; i++)
                             emit pointRemoved(qMax(start - m_mapFirst, 0));
                     }
                         // therefore it has no relevance
                         return;
                     else
+                    {
-                        // if there are excess items available (below the map) use them to repopulate mapped area
+                        // if the current items count in the whole model is bigger than the index of the last item
+                        // that was removed than it means there are some extra items available
                         int extraItemsAvailable = 0;
                         if (m_mapOrientation == Qt::Vertical)
                         {
-                            extraItemsAvailable = qMax(m_model->rowCount() - m_mapFirst, 0);
+                            extraItemsAvailable = qMax(m_model->rowCount() - end, 0);
                         }
                         else
                         {
-                            extraItemsAvailable = qMax(m_model->columnCount() - m_mapFirst, 0);
+                            extraItemsAvailable = qMax(m_model->columnCount() - end, 0);
                         }
-                        //            int extraItemsNeeded = qMin(extraItemsAvailable, tempItemsRemoved);
+                        // if there are excess items available (below the mapped area) use them to repopulate mapped area
-                        for (int k = 0; k < tempItemsRemoved; k++)
+                        int removedItemsCount = qMin(count(), qMin(end, m_mapFirst + m_mapCount - 1) - qMax(start, m_mapFirst) + 1);
-                            if (start - m_mapFirst + k < extraItemsAvailable)
+                        int toBeAdded = qMin(extraItemsAvailable, removedItemsCount);
+                        for (int k = 0; k < toBeAdded; k++)
-                                    emit pointAdded(count() - m_mapFirst + k);
+                            emit pointAdded(qMax(start - m_mapFirst, m_mapFirst) + k);
                     }
                 }
                 else
                 {
-                    //        emit pointRemoved(qMax(start - m_mapFirst, 0));
+                    // data was removed from XYSeries interal storage. Nothing more to do
                 }
             }

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