HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1356:2dd60111aef3

Fixes to BarSeries and BarModelMapper

Marek Rosa -

r1356:2dd60111aef3

parent child

Context file:

r1356:2dd60111aef3

Collapse all files

src/barchart/barchartitem.cpp +1 -1

                 }
                 // TODO: Is this the right place to call it?
-            //    presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
+                presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
                 handleLayoutChanged();
             }

src/barchart/qbarmodelmapper.cpp +15 -10

                 if (m_orientation == Qt::Vertical && index.column() >= m_firstBarSetSection && index.column() <= m_lastBarSetSection) {
                     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())
+                        //            if (m_model->index(index.row(), m_valuesSection).isValid() && m_model->index(index.row(), m_labelsSection).isValid())
-                            return m_series->barSets().at(index.column() - m_firstBarSetSection);
+                        return m_series->barSets().at(index.column() - m_firstBarSetSection);
-            //            else
+                        //            else
-            //                return 0;
+                        //                return 0;
                     }
                 } else if (m_orientation == Qt::Horizontal && index.row() >= m_firstBarSetSection && index.row() <= m_lastBarSetSection) {
                     if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
                 for (int i = m_firstBarSetSection; i <= m_lastBarSetSection; i++) {
                     int posInBar = 0;
                     QModelIndex barIndex = barModelIndex(i, posInBar);
-                    QBarSet *barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal).toString());
+                    // check if there is such model index
-                    while (barIndex.isValid()) {
+                    if (barIndex.isValid()) {
-                        barSet->append(m_model->data(barIndex, Qt::DisplayRole).toDouble());
+                        QBarSet *barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal).toString());
-                        posInBar++;
+                        while (barIndex.isValid()) {
-                        barIndex = barModelIndex(i, posInBar);
+                            barSet->append(m_model->data(barIndex, Qt::DisplayRole).toDouble());
+                            posInBar++;
+                            barIndex = barModelIndex(i, posInBar);
+                        }
+                        m_series->append(barSet);
+                    } else {
+                        break;
                     }
-                    m_series->append(barSet);
                 }
                 blockSeriesSignals(false);
             }

src/barchart/qbarseries.cpp +4 -1

                 return success;
             }
+            /*!
+                Removes all of the bar sets from the series
+            */
             void QBarSeries::clear()
             {
                 Q_D(QBarSeries);
-                d->m_barSets.clear();
+                d->remove(barSets());
             }
             /*!

tests/tablemodelchart/tablewidget.cpp +20 -15

                   m_mapper(0),
                   m_model(0),
                   m_pieMapper(0),
-                  m_pieMapper2(0)
+                  m_pieMapper2(0),
+                  m_barSeries(0),
+                  m_barMapper(0)
                 //      specialPie(0)
             {
                 setGeometry(1900, 100, 1000, 600);
                     //        }
                     else if (m_barRadioButton->isChecked())
                     {
-                        m_chart->setAnimationOptions(QChart::SeriesAnimations);
+            //            m_chart->setAnimationOptions(QChart::SeriesAnimations);
+                        m_chart->setAnimationOptions(QChart::NoAnimation);
-                        QGroupedBarSeries* barSeries = new QGroupedBarSeries();
+                        m_barSeries = new QGroupedBarSeries();
                         int first = 3;
                         int count = 6;
-                        QVBarModelMapper *mapper = new QVBarModelMapper;
+                        m_barMapper = new QVBarModelMapper;
-                        mapper->setFirstBarSetColumn(2);
+                        m_barMapper->setFirstBarSetColumn(2);
-                        mapper->setLastBarSetColumn(4);
+                        m_barMapper->setLastBarSetColumn(4);
-                        mapper->setFirst(first);
+                        m_barMapper->setFirst(first);
-                        mapper->setCount(count);
+                        m_barMapper->setCount(count);
-                        mapper->setSeries(barSeries);
+                        m_barMapper->setSeries(m_barSeries);
-                        mapper->setModel(m_model);
+                        m_barMapper->setModel(m_model);
             //            barSeries->setModelMapper(mapper);
-                        m_chart->addSeries(barSeries);
+                        m_chart->addSeries(m_barSeries);
                         QStringList categories;
                         categories << "June" << "July" << "August" << "September" << "October" << "November";
                         m_chart->axisX()->categories()->insert(categories);
-                        QList<QBarSet*> barsets = barSeries->barSets();
+                        QList<QBarSet*> barsets = m_barSeries->barSets();
                         for (int i = 0; i < barsets.count(); i++) {
                             seriesColorHex = "#" + QString::number(barsets.at(i)->brush().color().rgb(), 16).right(6).toUpper();
                             m_model->addMapping(seriesColorHex, QRect(2 + i, first, 1, barsets.at(i)->count()));
             void TableWidget::testXY()
             {
+                if (m_barMapper)
+                    m_barMapper->setLastBarSetColumn(m_barMapper->lastBarSetColumn() + 1);
                 //    if (m_series->type() != QAbstractSeries::SeriesTypeLine) {
                 //        m_series->append(QPointF(150, 75));
                 //    }
-                if (m_series->count() > 0) {
+            //    if (m_series->count() > 0) {
-                    m_series->remove(m_series->points().last());
+            //        m_series->remove(m_series->points().last());
+            //    }
             }
             TableWidget::~TableWidget()

tests/tablemodelchart/tablewidget.h +7 0

             #include <QVPieModelMapper>
             #include <QVXYModelMapper>
             #include <QHXYModelMapper>
+            #include <QGroupedBarSeries>
+            #include <QVBarModelMapper>
             class CustomTableModel;
             class QTableView;
                 QVXYModelMapper *m_mapper;
                 CustomTableModel* m_model;
                 QTableView* m_tableView;
                 QRadioButton* m_lineRadioButton;
                 QRadioButton* m_splineRadioButton;
                 QRadioButton* m_scatterRadioButton;
                 QRadioButton* m_areaRadioButton;
                 QRadioButton* m_barRadioButton;
                 QSpinBox* m_linesCountSpinBox;
                 QVPieModelMapper *m_pieMapper;
                 QPieSeries* m_pieSeries;
                 QVPieModelMapper *m_pieMapper2;
                 QPieSeries* m_pieSeries2;
+                QGroupedBarSeries* m_barSeries;
+                QVBarModelMapper* m_barMapper;
             //    QPieSeries* specialPie;
             };

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