HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1354:ab531266047d

Removed categories support from BarModelMapper

Marek Rosa -

r1354:ab531266047d

parent child

Context file:

r1354:ab531266047d

Collapse all files

src/barchart/qbarmodelmapper.cpp +4 -52

              }
              /*!
-                 Returns which section of the model is used as the data source for the x axis categories.
-             */
-             int QBarModelMapper::categoriesSection() const
+             {
-                 Q_D(const QBarModelMapper);
-                 return d->m_categoriesSection;
+             }
-             /*!
-                 Sets the model section that is used as the data source for the x axis categories.
-                 Parameter \a categoriesSection specifies the section of the model.
-             */
-             void QBarModelMapper::setCategoriesSection(int categoriesSection)
+             {
-                 Q_D(QBarModelMapper);
-                 d->m_categoriesSection = categoriesSection;
-                 d->initializeBarFromModel();
+             }
-             /*!
                  Resets the QBarModelMapper to the default state.
                  first: 0; count: -1; firstBarSetSection: -1; lastBarSetSection: -1; categoriesSection: -1
              */
                  d->m_count = -1;
                  d->m_firstBarSetSection = -1;
                  d->m_lastBarSetSection = -1;
-                 d->m_categoriesSection = -1;
                  d->initializeBarFromModel();
              }
                  m_orientation(Qt::Vertical),
                  m_firstBarSetSection(-1),
                  m_lastBarSetSection(-1),
-                 m_categoriesSection(-1),
                  m_seriesSignalsBlock(false),
                  m_modelSignalsBlock(false),
                  q_ptr(q)
                      return m_model->index(barSection, posInBar + m_first);
              }
-             QModelIndex QBarModelMapperPrivate::categoriesModelIndex(int posInCategories)
+             {
-                 if (m_count != -1 && posInCategories >= m_count)
-                     return QModelIndex(); // invalid
-                 if (m_orientation == Qt::Vertical)
-                     return m_model->index(posInCategories + m_first, m_categoriesSection);
-                 else
-                     return m_model->index(m_categoriesSection, posInCategories + m_first);
+             }
              void QBarModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
              {
                  Q_UNUSED(topLeft)
                  blockSeriesSignals();
                  QModelIndex index;
-                 //    QPointF oldPoint;
-                 //    QPointF newPoint;
                  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)
                      //        insertData(start, end);
                      initializeBarFromModel();
-                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
              }
                  if (m_orientation == Qt::Vertical)
                      //        removeData(start, end);
                      initializeBarFromModel();
-                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
              }
                  if (m_orientation == Qt::Horizontal)
                      //        insertData(start, end);
                      initializeBarFromModel();
-                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
              }
                  if (m_orientation == Qt::Horizontal)
                      //        removeData(start, end);
                      initializeBarFromModel();
-                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
              }
                      int posInBar = 0;
                      QModelIndex barIndex = barModelIndex(i, posInBar);
                      QBarSet *barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal).toString());
-                     //    QModelIndex yIndex = yModelIndex(pointPos);
                      while (barIndex.isValid()) {
                          barSet->append(m_model->data(barIndex, Qt::DisplayRole).toDouble());
                          posInBar++;
                      }
                      m_series->append(barSet);
                  }
-                 if (m_series->chart() && m_categoriesSection != -1) {
-                     int posInCategories = 0;
-                     QStringList categories;
-                     QModelIndex categoriesIndex = categoriesModelIndex(posInCategories);
-                     while (categoriesIndex.isValid()) {
-                         categories.append(m_model->data(categoriesIndex, Qt::DisplayRole).toString());
-                         posInCategories++;
-                         categoriesIndex = categoriesModelIndex(posInCategories);
+                     }
-                     m_series->chart()->axisX()->categories()->insert(categories);
+                 }
                  blockSeriesSignals(false);
              }

src/barchart/qbarmodelmapper.h 0 -3

                  int lastBarSetSection() const;
                  void setLastBarSetSection(int lastBarSetSection);
-                 int categoriesSection() const;
-                 void setCategoriesSection(int categoriesSection);
                  Qt::Orientation orientation() const;
                  void setOrientation(Qt::Orientation orientation);

src/barchart/qbarmodelmapper_p.h 0 -2

              private:
                  QBarSet* barSet(QModelIndex index);
                  QModelIndex barModelIndex(int barSection, int posInBar);
-                 QModelIndex categoriesModelIndex(int posInCategories);
                  void insertData(int start, int end);
                  void removeData(int start, int end);
                  void blockModelSignals(bool block = true);
                  Qt::Orientation m_orientation;
                  int m_firstBarSetSection;
                  int m_lastBarSetSection;
-                 int m_categoriesSection;
                  bool m_seriesSignalsBlock;
                  bool m_modelSignalsBlock;

src/barchart/qhbarmodelmapper.cpp 0 -17

              */
              /*!
-                 \property QHBarModelMapper::categoriesRow
-                 \brief Defines which row of the model is used as the data source for the x axis categories
-                 Default value is: -1 (invalid mapping)
-             */
-             /*!
                  Constructs a mapper object which is a child of \a parent.
              */
              QHBarModelMapper::QHBarModelMapper(QObject *parent) :
                  return QBarModelMapper::setLastBarSetSection(lastBarSetRow);
              }
-             int QHBarModelMapper::categoriesRow() const
+             {
-                 return QBarModelMapper::categoriesSection();
+             }
-             void QHBarModelMapper::setCategoriesRow(int categoriesRow)
+             {
-                 return QBarModelMapper::setCategoriesSection(categoriesRow);
+             }
              #include "moc_qhbarmodelmapper.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qhbarmodelmapper.h 0 -5

                  Q_OBJECT
                  Q_PROPERTY(int firstBarSetRow READ firstBarSetRow WRITE setFirstBarSetRow)
                  Q_PROPERTY(int lastBarSetRow READ lastBarSetRow WRITE setLastBarSetRow)
-                 Q_PROPERTY(int categoriesRow READ categoriesRow WRITE setCategoriesRow)
              public:
                  explicit QHBarModelMapper(QObject *parent = 0);
                  int lastBarSetRow() const;
                  void setLastBarSetRow(int lastBarSetRow);
-                 int categoriesRow() const;
-                 void setCategoriesRow(int categoriesRow);
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qvbarmodelmapper.cpp 0 -17

              */
              /*!
-                 \property QVBarModelMapper::categoriesColumn
-                 \brief Defines which column of the model is used as the data source for the x axis categories
-                 Default value is: -1 (invalid mapping)
-             */
-             /*!
                  Constructs a mapper object which is a child of \a parent.
              */
              QVBarModelMapper::QVBarModelMapper(QObject *parent) :
                  return QBarModelMapper::setLastBarSetSection(lastBarSetColumn);
              }
-             int QVBarModelMapper::categoriesColumn() const
+             {
-                 return QBarModelMapper::categoriesSection();
+             }
-             void QVBarModelMapper::setCategoriesColumn(int categoriesColumn)
+             {
-                 return QBarModelMapper::setCategoriesSection(categoriesColumn);
+             }
              #include "moc_qvbarmodelmapper.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qvbarmodelmapper.h 0 -5

                  Q_OBJECT
                  Q_PROPERTY(int firstBarSetColumn READ firstBarSetColumn WRITE setFirstBarSetColumn)
                  Q_PROPERTY(int lastBarSetColumn READ lastBarSetColumn WRITE setLastBarSetColumn)
-                 Q_PROPERTY(int categoriesColumn READ categoriesColumn WRITE setCategoriesColumn)
              public:
                  explicit QVBarModelMapper(QObject *parent = 0);
                  int lastBarSetColumn() const;
                  void setLastBarSetColumn(int lastBarSetColumn);
-                 int categoriesColumn() const;
-                 void setCategoriesColumn(int categoriesColumn);
              };
              QTCOMMERCIALCHART_END_NAMESPACE

tests/tablemodelchart/tablewidget.cpp +5 -6

                          m_chart->setAnimationOptions(QChart::SeriesAnimations);
                          QGroupedBarSeries* barSeries = new QGroupedBarSeries();
-             //            barSeries->setCategories(QStringList());
-             //            barSeries->setModel(m_model);
-                         //            barSeries->setModelMappingRange(2, 5);
-                         //                    barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
                          int first = 3;
                          int count = 6;
                          QVBarModelMapper *mapper = new QVBarModelMapper;
-                         mapper->setCategoriesColumn(5);
                          mapper->setFirstBarSetColumn(2);
                          mapper->setLastBarSetColumn(4);
                          mapper->setFirst(first);
              //            barSeries->setModelMapper(mapper);
                          m_chart->addSeries(barSeries);
+                         QStringList categories;
+                         categories << "June" << "July" << "August" << "September" << "October" << "November";
+                         m_chart->axisX()->categories()->insert(categories);
                          QList<QBarSet*> barsets = barSeries->barSets();
                          for (int i = 0; i < barsets.count(); i++) {
                              seriesColorHex = "#" + QString::number(barsets.at(i)->brush().color().rgb(), 16).right(6).toUpper();

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