HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r861:08ca4cc23d24

Small updates to tablemodelchart example

Marek Rosa -

r861:08ca4cc23d24

parent child

Context file:

r861:08ca4cc23d24

Collapse all files

examples/tablemodelchart/customtablemodel.cpp +1 -1

             void CustomTableModel::addMapping(QString color, QRect area)
             {
-                m_mapping.insert(color, area);
+                m_mapping.insertMulti(color, area);
             }
             void CustomTableModel::addMapping(QString color, int left, int top, int right, int bottom)

examples/tablemodelchart/tablewidget.cpp +9 -5

                 m_model = new CustomTableModel;
                 m_tableView = new QTableView;
                 m_tableView->setModel(m_model);
-                m_tableView->setMinimumHeight(240);
+                m_tableView->setMinimumHeight(300);
                 //    tableView->setMinimumSize(340, 480);
                 //    tableView->setItemDelegate(new QStyledItemDelegate);
                 m_chart = new QChart;
                 if (m_lineRadioButton->isChecked())
                 {
-                    m_chart->axisX()->setRange(0, 500);
-                    m_chart->axisY()->setRange(0, 120);
                     // series 1
                     m_series = new QLineSeries;
                     m_series->setModel(m_model);
                     QLineSeries* upperLineSeries = new QLineSeries;
                     upperLineSeries->setModel(m_model);
                     upperLineSeries->setModelMapping(0, 1, Qt::Vertical);
+                    upperLineSeries->setModelMappingShift(1, 5);
                     QLineSeries* lowerLineSeries = new QLineSeries;
                     lowerLineSeries->setModel(m_model);
                     lowerLineSeries->setModelMapping(2, 3, Qt::Vertical);
                     QAreaSeries* areaSeries = new QAreaSeries(upperLineSeries, lowerLineSeries);
                     m_chart->addSeries(areaSeries);
+                    seriesColorHex = "#" + QString::number(areaSeries->brush().color().rgb(), 16).right(6).toUpper();
+                    m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 5));
+                    m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                 }
                 else if (m_barRadioButton->isChecked())
                 {
                     }
                 }
+                m_chart->axisX()->setRange(0, 500);
+                m_chart->axisY()->setRange(0, 120);
                 // repaint table view colors
                 m_tableView->repaint();
                 m_tableView->setFocus();

src/xychart/qxyseries.cpp 0 -5

                         int removedItemsCount = qMin(count(), qMin(end, m_mapFirst + m_mapCount - 1) - start + 1);
                         int extraItemsAvailable = 0;
                         if (m_mapOrientation == Qt::Vertical) {
-            //                int temp1 = m_model->rowCount();
-            //                int temp2 = (end - start + 1);
-            //                int temp3 = qMax(end + 1, m_mapFirst + m_mapCount);
                             extraItemsAvailable = qMax(m_model->rowCount() + (end - start + 1) - qMax(end + 1, m_mapFirst + m_mapCount), 0);
                         } else {
                             extraItemsAvailable = qMax(m_model->columnCount() + (end - start + 1) - qMax(end + 1, m_mapFirst + m_mapCount), 0);
                 m_mapFirst = 0;
                 m_mapOrientation = orientation;
                 if (m_mapOrientation == Qt::Vertical) {
-                    //        m_mapCount = m_model->rowCount();
                     connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
                     connect(m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
                     connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
                     connect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
                     connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
                 } else {
-                    //        m_mapCount = m_model->columnCount();
                     connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
                     connect(m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
                     connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));

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